Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

There have been merge conflicts #367

Merged
merged 1 commit into from
Feb 16, 2024

Conversation

rive-engineering
Copy link

Please check commit message for details

…ep details in commit and not pr

gonna double check it and merge it...

previous job failed on hte pr message, probably too complex

https://github.com/rive-app/rive/actions/runs/7929209375/job/21648989390

```
+ gh pr create --fill --title 'There have been merge conflicts' --body 'diff --cc .github/workflows/tests.yml
index 76659125,e20119eb..00000000
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@@ -58,8 -58,9 +58,12 @@@ jobs
          run: |
            cd dev/test
            C:\premake5.exe --scripts=..\..\build vs2022
++<<<<<<< ours
++=======
+           cd out/debug
++>>>>>>> theirs
            MSBuild rive.sln
-           build\bin\debug\tests.exe
+           tests.exe

    build-macos:
      runs-on: macOS-latest'
pull request create failed: GraphQL: Something went wrong while executing your query. Please include `16C0:22C1:77BF52E:7B4322F:65CF3854` when reporting this issue.
```

Diffs=
6059f744d update mono to keep details in commit and not pr (#6637)
a394393a0 update mono scripts to be able to create "fixing" pr (#6636)
2277c08fc Apply same changes as downstream (#6634)
faf6ea317 Option to build harfbuzz with renames to avoid static lib collision. (#6630)
c51bda03e Fix downstream windows tests. (#6632)

Co-authored-by: Luigi Rosso <[email protected]>
Co-authored-by: Maxwell Talbot <[email protected]> diff=\n\ndiff --cc .github/workflows/tests.yml
index 76659125,e20119eb..00000000
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@@ -58,8 -58,9 +58,12 @@@ jobs
          run: |
            cd dev/test
            C:\premake5.exe --scripts=..\..\build vs2022
++<<<<<<< ours
++=======
+           cd out/debug
++>>>>>>> theirs
            MSBuild rive.sln
-           build\bin\debug\tests.exe
+           tests.exe

    build-macos:
      runs-on: macOS-latest
@mjtalbot mjtalbot requested review from luigi-rosso, csmartdalton, avivian and umberto-sonnino and removed request for luigi-rosso February 16, 2024 10:51
@mjtalbot mjtalbot merged commit c9a52af into master Feb 16, 2024
2 of 3 checks passed
@mjtalbot mjtalbot deleted the conflict_6059f744d9225938a1463ab66c965ecba7ec0dd3 branch February 16, 2024 11:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants